Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust installation place for compiler docs #75593

Merged
merged 1 commit into from
Aug 19, 2020
Merged

Adjust installation place for compiler docs #75593

merged 1 commit into from
Aug 19, 2020

Conversation

Mark-Simulacrum
Copy link
Member

This avoids conflicts when installing with rustup; rustup does not currently
support overlapping installations.

r? @matthiaskrgr

@Mark-Simulacrum
Adjust installation place for compiler docs
172e67e 
This avoids conflicts when installing with rustup; rustup does not currently
support overlapping installations.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 16, 2020
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Aug 16, 2020
Merged
@Mark-Simulacrum
Copy link
Member Author

@bors try

Let's get initial artifacts prepared so we can test this.

This might run into some problems with RCS's nightly-rustc promotion. I think it should be fine though and just upload to nightly-rustc/rustc until we can fix that (which should be easy, we just adjust the "tarball_dir" to include the newly added directory).

cc @pietroalbini -- I imagine what we'll want to do here is merge this and then merge rust-lang/rust-central-station#912 quickly thereafter, but if there's a better approach happy to use that too.

@bors
Copy link
Contributor

bors commented Aug 16, 2020

⌛ Trying commit 172e67e with merge 532ad7b...

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 16, 2020
@bors
Auto merge of rust-lang#75593 - Mark-Simulacrum:compiler-docs-must-no…
532ad7b 
…t-overlap, r=<try>

Adjust installation place for compiler docs

This avoids conflicts when installing with rustup; rustup does not currently
support overlapping installations.

r? @matthiaskrgr
@bors
Copy link
Contributor

bors commented Aug 16, 2020

☀️ Try build successful - checks-actions, checks-azure
Build commit: 532ad7b (532ad7b7e44f22c3093f3e0e26749d346a9ec485)

@matthiaskrgr
Copy link
Member

I tried to install a lot of different components now and the toolchain-installer-master did not find any conflicts: rustup-toolchain-install-master 532ad7b7e44f22c3093f3e0e26749d346a9ec485 -f -c rustc-docs cargo miri rust-src rustc-dev rustfmt llvm-tools clippy
But I already tried something similar for previous commit and it did not detect the regression which the original rustup had, so I'm not that confident...

r=me I guess?

@Mark-Simulacrum
Copy link
Member Author

I am going to r? @pietroalbini on this -- in particular how to deploy RCS in sync with this patch I'm a bit unclear on. I've kicked off promotion for 532ad7b on rust-central-station though.

@pietroalbini
Copy link
Member

Left a comment in RCS on a possible transition plan.

@pietroalbini
Copy link
Member

r=me once RCS is deployed

@Mark-Simulacrum
Copy link
Member Author

RCS has been deployed, so let's @bors r+ this

@bors
Copy link
Contributor

bors commented Aug 18, 2020

📌 Commit 172e67e has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 18, 2020
@Mark-Simulacrum
Copy link
Member Author

er, @bors r- r=pietroalbini

@bors
Copy link
Contributor

bors commented Aug 18, 2020

📌 Commit 172e67e has been approved by pietroalbini

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 18, 2020
tmandry added a commit to tmandry/rust that referenced this pull request Aug 19, 2020
@tmandry
Rollup merge of rust-lang#75593 - Mark-Simulacrum:compiler-docs-must-…
42b3ed6 
…not-overlap, r=pietroalbini

Adjust installation place for compiler docs

This avoids conflicts when installing with rustup; rustup does not currently
support overlapping installations.

r? @matthiaskrgr
@tmandry tmandry mentioned this pull request Aug 19, 2020
Closed
@tmandry tmandry mentioned this pull request Aug 19, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 19, 2020
@bors
Auto merge of rust-lang#75715 - tmandry:rollup-18atkj4, r=tmandry
9900178 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#75069 (move const param structural match checks to wfcheck)
 - rust-lang#75587 (mir building: fix some comments)
 - rust-lang#75593 (Adjust installation place for compiler docs)
 - rust-lang#75648 (Make OnceCell<T> transparent to dropck)
 - rust-lang#75649 (Fix intra-doc links for inherent impls that are both lang items and not the default impl)
 - rust-lang#75674 (Move to intra doc links for std::io)
 - rust-lang#75696 (Remove `#[cfg(miri)]` from OnceCell tests)

Failed merges:

r? @ghost
@bors bors merged commit 0e7e939 into rust-lang:master Aug 19, 2020
@matthiaskrgr
Copy link
Member

This did not fix the issue unfortunately :/

info: downloading component 'rustc-docs'
info: installing component 'rustc-docs'
info: Defaulting to 500.0 MiB unpack ram
  9.9 MiB /   9.9 MiB (100 %)   2.4 MiB/s in  4s ETA:  0s
info: rolling back changes
error: failed to install component: 'rustc-docs-x86_64-unknown-linux-gnu', detected conflict: '"share/doc/rust/html/rustc"'

@matthiaskrgr matthiaskrgr mentioned this pull request Aug 23, 2020
Open
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pietroalbini pietroalbini

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Mark-Simulacrum @bors @matthiaskrgr @pietroalbini @cuviper @rust-highfive